gnome-shell.in: Never add empty elements to LD_LIBRARY_PATH

An empty element means the current directory, and is insecure.

https://bugzilla.gnome.org/show_bug.cgi?id=631004

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 163ecfc11d5466fb9f3d8bfd698da3dc1fb168c6..b523bde753d685d273b1a66921b48c148ff2e05c 100755 (executable)
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -246,7 +246,11 @@ def start_shell(perf_output=None):
     if pkgconfig.returncode == 0:
         mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
         if os.path.exists(mozjs_libdir + '/libmozjs.so'):
-            env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
+            if 'LD_LIBRARY_PATH' in env:
+                ld_library_path = env['LD_LIBRARY_PATH'] + ':' + mozjs_libdir
+            else:
+                ld_library_path = mozjs_libdir
+            env['LD_LIBRARY_PATH'] = ld_library_path
 
     # Log everything to stderr (make stderr our "log file")
     env['GJS_DEBUG_OUTPUT'] = 'stderr'